Fix encoded image being suggested for non-image blobs (like video) #7428
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Wumpf
added
🪳 bug
jleibs
approved these changes
Sep 16, 2024
emilk
approved these changes
Sep 16, 2024
Comment on lines
+51
to
+57
| fn update_applicability(&mut self, event: &re_chunk_store::ChunkStoreEvent) -> bool { | ||
| diff_component_filter(event, |media_type: &re_types::components::MediaType| { | ||
| media_type.is_image() | ||
| }) || diff_component_filter(event, |image: &re_types::components::Blob| { | ||
| MediaType::guess_from_data(&image.0).map_or(false, |media| media.is_image()) | ||
| }) | ||
| } |
There was a problem hiding this comment.
Not new to this PR, but I think there is room for improvement of the naming of these things, maybe:
Suggested change
| fn update_applicability(&mut self, event: &re_chunk_store::ChunkStoreEvent) -> bool { | |
| diff_component_filter(event, |media_type: &re_types::components::MediaType| { | |
| media_type.is_image() | |
| }) || diff_component_filter(event, |image: &re_types::components::Blob| { | |
| MediaType::guess_from_data(&image.0).map_or(false, |media| media.is_image()) | |
| }) | |
| } | |
| fn is_applicable(&mut self, event: &re_chunk_store::ChunkStoreEvent) -> bool { | |
| is_any_component(event, |media_type: &re_types::components::MediaType| { | |
| media_type.is_image() | |
| }) || is_any_component(event, |image: &re_types::components::Blob| { | |
| MediaType::guess_from_data(&image.0).map_or(false, |media| media.is_image()) | |
| }) | |
| } |
Also, does this really need &mut self?
anyway, no need to fix now. Just thinking out loud.
There was a problem hiding this comment.
I'm not gonna change the trait and all associated implemenations now in this PR ;)
The semantics of update are correct and very relevant as this is an incremental and stateful update of the applicability. Details are on the trait's documentation
There was a problem hiding this comment.
&mut self is for convenience if a trait implementor wants to track additional data that influence applicability
emilk
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What
Before:
After, the button is greyed out.
Made sure images still work fine by dragging in an image.
Checklist
mainbuild: rerun.io/viewernightlybuild: rerun.io/viewerCHANGELOG.mdand the migration guideTo run all checks from
main, comment on the PR with@rerun-bot full-check.